Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 21 Mar 2010 11:01:52 +0000 (11:01 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 21 Mar 2010 11:01:52 +0000 (11:01 +0000)

Trivial merge